From: kfraser@localhost.localdomain Date: Fri, 7 Sep 2007 10:24:28 +0000 (+0100) Subject: xend: Fix error message for xm trigger command. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14987^2~4 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=214523659d2433c54329411d06ce7dbbb95fa39b;p=xen.git xend: Fix error message for xm trigger command. When I tested xm trigger command with a wrong argument, I saw the following error message. # xm trigger vm1 xyz Error: __init__() takes exactly 2 arguments (3 given) Usage: xm trigger [] Send a trigger to a domain. This patch fixes the error message as follows. # xm trigger vm1 xyz Error: Invalid trigger: xyz Usage: xm trigger [] Send a trigger to a domain. The type of "TRIGGER_TYPE" is dictionary. domain_send_trigger() refers to the keys of "TRIGGER_TYPE" without using keys() currently. This patch adds keys() there. Signed-off-by: Masaki Kanno --- diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index 9947111a8b..083fd2464d 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -1594,10 +1594,10 @@ class XendDomain: raise VMBadState("Domain '%s' is not started" % domid, POWER_STATE_NAMES[DOM_STATE_RUNNING], POWER_STATE_NAMES[dominfo._stateGet()]) - if trigger_name.lower() in TRIGGER_TYPE: + if trigger_name.lower() in TRIGGER_TYPE.keys(): trigger = TRIGGER_TYPE[trigger_name.lower()] else: - raise XendError("Invalid trigger: %s", trigger_name) + raise XendError("Invalid trigger: %s" % trigger_name) try: return xc.domain_send_trigger(dominfo.getDomid(), trigger,